From f83588f87e9ae756016073e80f3cfc6187d8a816 Mon Sep 17 00:00:00 2001 From: "15:18:17 Tim Janik" Date: Mon, 3 Dec 2007 14:17:31 +0000 Subject: [PATCH] use 'grep -o' to extract _get_type functions from header files. this 2007-12-03 15:18:17 Tim Janik * gtk/Makefile.am (gtktypefuncs.c): use 'grep -o' to extract _get_type functions from header files. this should be portable across linux and Mac OS, unlike the previpous sed expression. svn path=/trunk/; revision=19098 --- ChangeLog | 8 +++++++- gtk/Makefile.am | 3 +-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ecce26a0bf..51782e2a73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-12-03 15:18:17 Tim Janik + + * gtk/Makefile.am (gtktypefuncs.c): use 'grep -o' to extract _get_type + functions from header files. this should be portable across linux and + Mac OS, unlike the previpous sed expression. + 2007-12-1 Cody Russell * gtk/gtkpaned.c: (gtk_paned_set_position) [Win32]: @@ -13,7 +19,7 @@ * gtk/gtkrc.c: Fix doc typos. (#500672, David Lambert) 2007-11-29 Matthias Clasen - + * gtk/gtkmenuitem.c (gtk_menu_item_paint): Remove leftover debug spew. diff --git a/gtk/Makefile.am b/gtk/Makefile.am index e960a07fba..7e1395365d 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -815,8 +815,7 @@ gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) gtktypebuiltins.c.template gtktypefuncs.c: @REBUILD@ $(top_srcdir)/gtk/*.h $(top_srcdir)/gdk/*.h Makefile echo '#include ' > xgen-gtfsrc.c && \ ${CPP} $(DEFS) $(INCLUDES) -DGTK_ENABLE_BROKEN $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \ - egrep '\' | \ - sed -e 's/.*\(\\).*/\1/' | \ + grep -o '\bg[td]k_[a-zA-Z0-9_]*_get_type\b' | \ sort | uniq | \ sed '{ s/^/vgt=/; s/$$/();/; }' > xgen-gtf \ && cp xgen-gtf $@ && rm -f xgen-gtf -- 2.30.2